Autogenerated HTML docs for v1.7.1 
diff --git a/RelNotes-1.7.1.txt b/RelNotes-1.7.1.txt index 10389ad..9d89fed 100644 --- a/RelNotes-1.7.1.txt +++ b/RelNotes-1.7.1.txt 
@@ -1,5 +1,5 @@ -Git v1.7.1 Release Notes (draft) -================================ +Git v1.7.1 Release Notes +========================    Updates since v1.7.0  -------------------- @@ -87,9 +87,3 @@    * "git rev-list --abbrev-commit" defaulted to 40-byte abbreviations, unlike  newer tools in the git toolset. - ---- -exec >/var/tmp/1 -echo O=$(git describe) -O=v1.7.1-rc1-49-g407a963 -git shortlog --no-merges ^maint $O.. 
diff --git a/everyday.html b/everyday.html index 7f3e15d..511b7a7 100644 --- a/everyday.html +++ b/everyday.html 
@@ -1026,7 +1026,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-04 19:11:47 UTC  +Last updated 2010-04-24 02:56:16 UTC   </div>   </div>   </body>  
diff --git a/git-add.html b/git-add.html index ae5f562..faf55bc 100644 --- a/git-add.html +++ b/git-add.html 
@@ -721,7 +721,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:33 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-am.html b/git-am.html index ab813e4..c942a17 100644 --- a/git-am.html +++ b/git-am.html 
@@ -653,7 +653,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-11 01:17:13 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-annotate.html b/git-annotate.html index 680b849..290623b 100644 --- a/git-annotate.html +++ b/git-annotate.html 
@@ -552,7 +552,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-12 15:45:39 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-apply.html b/git-apply.html index 35e18ef..fe60820 100644 --- a/git-apply.html +++ b/git-apply.html 
@@ -729,7 +729,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:34 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-archimport.html b/git-archimport.html index 13df337..45aad6e 100644 --- a/git-archimport.html +++ b/git-archimport.html 
@@ -470,7 +470,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:34 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-archive.html b/git-archive.html index 332a928..1d3dba7 100644 --- a/git-archive.html +++ b/git-archive.html 
@@ -592,7 +592,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:34 UTC  +Last updated 2010-04-24 02:55:46 UTC   </div>   </div>   </body>  
diff --git a/git-bisect-lk2009.html b/git-bisect-lk2009.html index 8f62bb2..2ed3a45 100644 --- a/git-bisect-lk2009.html +++ b/git-bisect-lk2009.html 
@@ -1472,7 +1472,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:05 UTC  +Last updated 2010-04-24 02:56:17 UTC   </div>   </div>   </body>  
diff --git a/git-bisect.html b/git-bisect.html index 93bafee..3341ab6 100644 --- a/git-bisect.html +++ b/git-bisect.html 
@@ -613,7 +613,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:34 UTC  +Last updated 2010-04-24 02:55:47 UTC   </div>   </div>   </body>  
diff --git a/git-blame.html b/git-blame.html index 820bcbf..53c9a84 100644 --- a/git-blame.html +++ b/git-blame.html 
@@ -860,7 +860,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-12 15:45:39 UTC  +Last updated 2010-04-24 02:55:47 UTC   </div>   </div>   </body>  
diff --git a/git-branch.html b/git-branch.html index baab860..3036311 100644 --- a/git-branch.html +++ b/git-branch.html 
@@ -700,7 +700,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-18 00:00:44 UTC  +Last updated 2010-04-24 02:55:47 UTC   </div>   </div>   </body>  
diff --git a/git-bundle.html b/git-bundle.html index 9836ec2..8572ced 100644 --- a/git-bundle.html +++ b/git-bundle.html 
@@ -535,7 +535,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:35 UTC  +Last updated 2010-04-24 02:55:47 UTC   </div>   </div>   </body>  
diff --git a/git-cat-file.html b/git-cat-file.html index e18f27c..4e040a6 100644 --- a/git-cat-file.html +++ b/git-cat-file.html 
@@ -455,7 +455,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:35 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-check-attr.html b/git-check-attr.html index 67f600b..77a4d8d 100644 --- a/git-check-attr.html +++ b/git-check-attr.html 
@@ -481,7 +481,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:36 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-check-ref-format.html b/git-check-ref-format.html index b35ca51..771c01a 100644 --- a/git-check-ref-format.html +++ b/git-check-ref-format.html 
@@ -454,7 +454,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:43 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-checkout-index.html b/git-checkout-index.html index dc44a88..18f1582 100644 --- a/git-checkout-index.html +++ b/git-checkout-index.html 
@@ -574,7 +574,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:36 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-checkout.html b/git-checkout.html index ca87f2b..917f2f9 100644 --- a/git-checkout.html +++ b/git-checkout.html 
@@ -675,7 +675,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:36 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-cherry-pick.html b/git-cherry-pick.html index 3869be7..bc92365 100644 --- a/git-cherry-pick.html +++ b/git-cherry-pick.html 
@@ -452,7 +452,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-29 07:49:09 UTC  +Last updated 2010-04-24 02:55:48 UTC   </div>   </div>   </body>  
diff --git a/git-cherry.html b/git-cherry.html index b886358..502b55e 100644 --- a/git-cherry.html +++ b/git-cherry.html 
@@ -411,7 +411,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:36 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-citool.html b/git-citool.html index 4231246..30c82db 100644 --- a/git-citool.html +++ b/git-citool.html 
@@ -345,7 +345,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:37 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-clean.html b/git-clean.html index 474f8df..1cd28fb 100644 --- a/git-clean.html +++ b/git-clean.html 
@@ -414,7 +414,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:37 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-clone.html b/git-clone.html index b5a779e..895612e 100644 --- a/git-clone.html +++ b/git-clone.html 
@@ -792,7 +792,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:00 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-commit-tree.html b/git-commit-tree.html index 992884b..c77c874 100644 --- a/git-commit-tree.html +++ b/git-commit-tree.html 
@@ -571,7 +571,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:37 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-commit.html b/git-commit.html index 1860424..62f8f5b 100644 --- a/git-commit.html +++ b/git-commit.html 
@@ -994,7 +994,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-20 20:01:08 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-config.html b/git-config.html index 084d9af..99be130 100644 --- a/git-config.html +++ b/git-config.html 
@@ -3871,7 +3871,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:00 UTC  +Last updated 2010-04-24 02:55:49 UTC   </div>   </div>   </body>  
diff --git a/git-count-objects.html b/git-count-objects.html index ade6e4c..47eb070 100644 --- a/git-count-objects.html +++ b/git-count-objects.html 
@@ -361,7 +361,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:38 UTC  +Last updated 2010-04-24 02:55:50 UTC   </div>   </div>   </body>  
diff --git a/git-cvsexportcommit.html b/git-cvsexportcommit.html index cb47ac4..0a687b9 100644 --- a/git-cvsexportcommit.html +++ b/git-cvsexportcommit.html 
@@ -514,7 +514,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:38 UTC  +Last updated 2010-04-24 02:55:50 UTC   </div>   </div>   </body>  
diff --git a/git-cvsimport.html b/git-cvsimport.html index b7e72b9..69a2452 100644 --- a/git-cvsimport.html +++ b/git-cvsimport.html 
@@ -672,7 +672,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-03 05:12:39 UTC  +Last updated 2010-04-24 02:55:51 UTC   </div>   </div>   </body>  
diff --git a/git-cvsserver.html b/git-cvsserver.html index 5545dd4..136b241 100644 --- a/git-cvsserver.html +++ b/git-cvsserver.html 
@@ -806,7 +806,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:39 UTC  +Last updated 2010-04-24 02:55:51 UTC   </div>   </div>   </body>  
diff --git a/git-daemon.html b/git-daemon.html index 2feadcd..7b5980b 100644 --- a/git-daemon.html +++ b/git-daemon.html 
@@ -753,7 +753,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:39 UTC  +Last updated 2010-04-24 02:55:52 UTC   </div>   </div>   </body>  
diff --git a/git-describe.html b/git-describe.html index b94326e..7db58b5 100644 --- a/git-describe.html +++ b/git-describe.html 
@@ -545,7 +545,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:20 UTC  +Last updated 2010-04-24 02:55:52 UTC   </div>   </div>   </body>  
diff --git a/git-diff-files.html b/git-diff-files.html index 098f36b..4328e5f 100644 --- a/git-diff-files.html +++ b/git-diff-files.html 
@@ -1431,7 +1431,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:00 UTC  +Last updated 2010-04-24 02:55:52 UTC   </div>   </div>   </body>  
diff --git a/git-diff-index.html b/git-diff-index.html index beb1dbf..c21809f 100644 --- a/git-diff-index.html +++ b/git-diff-index.html 
@@ -1509,7 +1509,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:01 UTC  +Last updated 2010-04-24 02:55:52 UTC   </div>   </div>   </body>  
diff --git a/git-diff-tree.html b/git-diff-tree.html index 3621866..1821fa4 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html 
@@ -2069,7 +2069,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:02 UTC  +Last updated 2010-04-24 02:55:53 UTC   </div>   </div>   </body>  
diff --git a/git-diff.html b/git-diff.html index 2eabfd8..ef7d3ab 100644 --- a/git-diff.html +++ b/git-diff.html 
@@ -1638,7 +1638,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:02 UTC  +Last updated 2010-04-24 02:55:53 UTC   </div>   </div>   </body>  
diff --git a/git-difftool.html b/git-difftool.html index 118f247..bd05d52 100644 --- a/git-difftool.html +++ b/git-difftool.html 
@@ -508,7 +508,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:41 UTC  +Last updated 2010-04-24 02:55:53 UTC   </div>   </div>   </body>  
diff --git a/git-fast-export.html b/git-fast-export.html index 3a855f6..e8faae1 100644 --- a/git-fast-export.html +++ b/git-fast-export.html 
@@ -494,7 +494,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:42 UTC  +Last updated 2010-04-24 02:55:54 UTC   </div>   </div>   </body>  
diff --git a/git-fast-import.html b/git-fast-import.html index e7f047e..d9ed775 100644 --- a/git-fast-import.html +++ b/git-fast-import.html 
@@ -1649,7 +1649,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:44 UTC  +Last updated 2010-04-24 02:55:54 UTC   </div>   </div>   </body>  
diff --git a/git-fetch-pack.html b/git-fetch-pack.html index 2adf77f..0d324c0 100644 --- a/git-fetch-pack.html +++ b/git-fetch-pack.html 
@@ -485,7 +485,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:44 UTC  +Last updated 2010-04-24 02:55:54 UTC   </div>   </div>   </body>  
diff --git a/git-fetch.html b/git-fetch.html index bc9b5f5..fd16260 100644 --- a/git-fetch.html +++ b/git-fetch.html 
@@ -894,7 +894,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:03 UTC  +Last updated 2010-04-24 02:55:54 UTC   </div>   </div>   </body>  
diff --git a/git-filter-branch.html b/git-filter-branch.html index 7c00930..6e07831 100644 --- a/git-filter-branch.html +++ b/git-filter-branch.html 
@@ -787,7 +787,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:43 UTC  +Last updated 2010-04-24 02:55:55 UTC   </div>   </div>   </body>  
diff --git a/git-fmt-merge-msg.html b/git-fmt-merge-msg.html index 3be7e20..4ae6df6 100644 --- a/git-fmt-merge-msg.html +++ b/git-fmt-merge-msg.html 
@@ -421,7 +421,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:43 UTC  +Last updated 2010-04-24 02:55:55 UTC   </div>   </div>   </body>  
diff --git a/git-for-each-ref.html b/git-for-each-ref.html index 9a54f47..ddaf50c 100644 --- a/git-for-each-ref.html +++ b/git-for-each-ref.html 
@@ -566,7 +566,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:43 UTC  +Last updated 2010-04-24 02:55:55 UTC   </div>   </div>   </body>  
diff --git a/git-format-patch.html b/git-format-patch.html index 9062852..e743de1 100644 --- a/git-format-patch.html +++ b/git-format-patch.html 
@@ -1036,7 +1036,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:03 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-fsck-objects.html b/git-fsck-objects.html index d97f611..cb211e8 100644 --- a/git-fsck-objects.html +++ b/git-fsck-objects.html 
@@ -329,7 +329,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:44 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-fsck.html b/git-fsck.html index 4637f0e..565b65c 100644 --- a/git-fsck.html +++ b/git-fsck.html 
@@ -572,7 +572,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:44 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-gc.html b/git-gc.html index 79a61dd..a3a6b29 100644 --- a/git-gc.html +++ b/git-gc.html 
@@ -469,7 +469,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:44 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-get-tar-commit-id.html b/git-get-tar-commit-id.html index 7a5e815..483e126 100644 --- a/git-get-tar-commit-id.html +++ b/git-get-tar-commit-id.html 
@@ -346,7 +346,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:44 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-grep.html b/git-grep.html index 261d4bd..46f2803 100644 --- a/git-grep.html +++ b/git-grep.html 
@@ -726,7 +726,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-07 22:24:59 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-gui.html b/git-gui.html index 4d56596..2efb8ad 100644 --- a/git-gui.html +++ b/git-gui.html 
@@ -512,7 +512,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:45 UTC  +Last updated 2010-04-24 02:55:56 UTC   </div>   </div>   </body>  
diff --git a/git-hash-object.html b/git-hash-object.html index bb4ff10..a6115ca 100644 --- a/git-hash-object.html +++ b/git-hash-object.html 
@@ -411,7 +411,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-07 09:09:56 UTC  +Last updated 2010-04-24 02:55:57 UTC   </div>   </div>   </body>  
diff --git a/git-help.html b/git-help.html index bb78d54..3a5c2f2 100644 --- a/git-help.html +++ b/git-help.html 
@@ -523,7 +523,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:45 UTC  +Last updated 2010-04-24 02:55:57 UTC   </div>   </div>   </body>  
diff --git a/git-http-backend.html b/git-http-backend.html index 86bdd8f..5daf40b 100644 --- a/git-http-backend.html +++ b/git-http-backend.html 
@@ -546,7 +546,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-01 04:49:02 UTC  +Last updated 2010-04-24 02:55:57 UTC   </div>   </div>   </body>  
diff --git a/git-http-fetch.html b/git-http-fetch.html index 2fc5720..730520d 100644 --- a/git-http-fetch.html +++ b/git-http-fetch.html 
@@ -417,7 +417,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:45 UTC  +Last updated 2010-04-24 02:55:57 UTC   </div>   </div>   </body>  
diff --git a/git-http-push.html b/git-http-push.html index f1269cc..b98d152 100644 --- a/git-http-push.html +++ b/git-http-push.html 
@@ -474,7 +474,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:45 UTC  +Last updated 2010-04-24 02:55:57 UTC   </div>   </div>   </body>  
diff --git a/git-imap-send.html b/git-imap-send.html index 38ab645..d365e19 100644 --- a/git-imap-send.html +++ b/git-imap-send.html 
@@ -483,7 +483,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-04 19:11:46 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-index-pack.html b/git-index-pack.html index f41604f..d9a29c1 100644 --- a/git-index-pack.html +++ b/git-index-pack.html 
@@ -450,7 +450,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:44 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-init-db.html b/git-init-db.html index a0566df..1471ae1 100644 --- a/git-init-db.html +++ b/git-init-db.html 
@@ -329,7 +329,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:46 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-init.html b/git-init.html index c0a384e..12d069e 100644 --- a/git-init.html +++ b/git-init.html 
@@ -506,7 +506,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-11 01:17:14 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-instaweb.html b/git-instaweb.html index eeda15d..ff8e9b5 100644 --- a/git-instaweb.html +++ b/git-instaweb.html 
@@ -458,7 +458,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:46 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-log.html b/git-log.html index 1156035..5ef460f 100644 --- a/git-log.html +++ b/git-log.html 
@@ -2607,7 +2607,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:04 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-lost-found.html b/git-lost-found.html index 1612795..08714d2 100644 --- a/git-lost-found.html +++ b/git-lost-found.html 
@@ -388,7 +388,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:46 UTC  +Last updated 2010-04-24 02:55:58 UTC   </div>   </div>   </body>  
diff --git a/git-ls-files.html b/git-ls-files.html index ccf5baa..4c9dbc4 100644 --- a/git-ls-files.html +++ b/git-ls-files.html 
@@ -714,7 +714,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:47 UTC  +Last updated 2010-04-24 02:55:59 UTC   </div>   </div>   </body>  
diff --git a/git-ls-remote.html b/git-ls-remote.html index 378d6be..97ad4a4 100644 --- a/git-ls-remote.html +++ b/git-ls-remote.html 
@@ -421,7 +421,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:47 UTC  +Last updated 2010-04-24 02:55:59 UTC   </div>   </div>   </body>  
diff --git a/git-ls-tree.html b/git-ls-tree.html index 7374dd0..534d83a 100644 --- a/git-ls-tree.html +++ b/git-ls-tree.html 
@@ -495,7 +495,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:47 UTC  +Last updated 2010-04-24 02:55:59 UTC   </div>   </div>   </body>  
diff --git a/git-mailinfo.html b/git-mailinfo.html index c7576cc..04875b4 100644 --- a/git-mailinfo.html +++ b/git-mailinfo.html 
@@ -450,7 +450,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:48 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-mailsplit.html b/git-mailsplit.html index e9f1338..49a1c3e 100644 --- a/git-mailsplit.html +++ b/git-mailsplit.html 
@@ -418,7 +418,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-11 01:17:14 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-merge-base.html b/git-merge-base.html index 8ae812f..0595c98 100644 --- a/git-merge-base.html +++ b/git-merge-base.html 
@@ -420,7 +420,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:48 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-merge-file.html b/git-merge-file.html index 8f64a25..6c6b65e 100644 --- a/git-merge-file.html +++ b/git-merge-file.html 
@@ -444,7 +444,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-20 20:59:12 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-merge-index.html b/git-merge-index.html index a9e2745..d296779 100644 --- a/git-merge-index.html +++ b/git-merge-index.html 
@@ -420,7 +420,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:48 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-merge-one-file.html b/git-merge-one-file.html index 0d26ca1..b922212 100644 --- a/git-merge-one-file.html +++ b/git-merge-one-file.html 
@@ -342,7 +342,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:48 UTC  +Last updated 2010-04-24 02:56:00 UTC   </div>   </div>   </body>  
diff --git a/git-merge-tree.html b/git-merge-tree.html index d7c895a..395d6a0 100644 --- a/git-merge-tree.html +++ b/git-merge-tree.html 
@@ -348,7 +348,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:49 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-merge.html b/git-merge.html index ae23881..660bfac 100644 --- a/git-merge.html +++ b/git-merge.html 
@@ -1020,7 +1020,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-14 14:07:15 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-mergetool--lib.html b/git-mergetool--lib.html index 184f617..73d7567 100644 --- a/git-mergetool--lib.html +++ b/git-mergetool--lib.html 
@@ -388,7 +388,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:49 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-mergetool.html b/git-mergetool.html index 68f0902..ad34a35 100644 --- a/git-mergetool.html +++ b/git-mergetool.html 
@@ -414,7 +414,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:49 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-mktag.html b/git-mktag.html index 23f2c76..deb4e9c 100644 --- a/git-mktag.html +++ b/git-mktag.html 
@@ -358,7 +358,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:49 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-mktree.html b/git-mktree.html index 23fc0ee..e3c85ce 100644 --- a/git-mktree.html +++ b/git-mktree.html 
@@ -378,7 +378,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:49 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-mv.html b/git-mv.html index 7754809..d23a7d4 100644 --- a/git-mv.html +++ b/git-mv.html 
@@ -391,7 +391,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:50 UTC  +Last updated 2010-04-24 02:56:01 UTC   </div>   </div>   </body>  
diff --git a/git-name-rev.html b/git-name-rev.html index f3ea205..7ac9016 100644 --- a/git-name-rev.html +++ b/git-name-rev.html 
@@ -428,7 +428,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:50 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-notes.html b/git-notes.html index 317dac1..779b101 100644 --- a/git-notes.html +++ b/git-notes.html 
@@ -537,7 +537,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:23 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-pack-objects.html b/git-pack-objects.html index ec4190f..c340fc2 100644 --- a/git-pack-objects.html +++ b/git-pack-objects.html 
@@ -674,7 +674,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-07 22:24:59 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-pack-redundant.html b/git-pack-redundant.html index e4c4b14..149914e 100644 --- a/git-pack-redundant.html +++ b/git-pack-redundant.html 
@@ -383,7 +383,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:50 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-pack-refs.html b/git-pack-refs.html index f05e5f6..6e55091 100644 --- a/git-pack-refs.html +++ b/git-pack-refs.html 
@@ -384,7 +384,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:50 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-parse-remote.html b/git-parse-remote.html index 413419a..a30086d 100644 --- a/git-parse-remote.html +++ b/git-parse-remote.html 
@@ -343,7 +343,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:51 UTC  +Last updated 2010-04-24 02:56:02 UTC   </div>   </div>   </body>  
diff --git a/git-patch-id.html b/git-patch-id.html index 1223a80..a971941 100644 --- a/git-patch-id.html +++ b/git-patch-id.html 
@@ -362,7 +362,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:51 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-peek-remote.html b/git-peek-remote.html index 5651971..49c6c00 100644 --- a/git-peek-remote.html +++ b/git-peek-remote.html 
@@ -380,7 +380,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:51 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-prune-packed.html b/git-prune-packed.html index c5263e1..93813e0 100644 --- a/git-prune-packed.html +++ b/git-prune-packed.html 
@@ -379,7 +379,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:51 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-prune.html b/git-prune.html index 200cf49..420c839 100644 --- a/git-prune.html +++ b/git-prune.html 
@@ -429,7 +429,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:45 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-pull.html b/git-pull.html index d109a1c..248281d 100644 --- a/git-pull.html +++ b/git-pull.html 
@@ -1217,7 +1217,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:04 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-push.html b/git-push.html index 6929b6f..d8f0a09 100644 --- a/git-push.html +++ b/git-push.html 
@@ -1117,7 +1117,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:04 UTC  +Last updated 2010-04-24 02:56:03 UTC   </div>   </div>   </body>  
diff --git a/git-quiltimport.html b/git-quiltimport.html index 1471b76..8d69ba9 100644 --- a/git-quiltimport.html +++ b/git-quiltimport.html 
@@ -390,7 +390,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:52 UTC  +Last updated 2010-04-24 02:56:04 UTC   </div>   </div>   </body>  
diff --git a/git-read-tree.html b/git-read-tree.html index 2694dff..68daec3 100644 --- a/git-read-tree.html +++ b/git-read-tree.html 
@@ -829,7 +829,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-17 05:41:36 UTC  +Last updated 2010-04-24 02:56:04 UTC   </div>   </div>   </body>  
diff --git a/git-rebase.html b/git-rebase.html index 680c39b..f9d6d05 100644 --- a/git-rebase.html +++ b/git-rebase.html 
@@ -1220,7 +1220,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-04 19:11:46 UTC  +Last updated 2010-04-24 02:56:04 UTC   </div>   </div>   </body>  
diff --git a/git-receive-pack.html b/git-receive-pack.html index 27ffb43..406d0da 100644 --- a/git-receive-pack.html +++ b/git-receive-pack.html 
@@ -478,7 +478,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:53 UTC  +Last updated 2010-04-24 02:56:04 UTC   </div>   </div>   </body>  
diff --git a/git-reflog.html b/git-reflog.html index 8b2c9bd..9df99c3 100644 --- a/git-reflog.html +++ b/git-reflog.html 
@@ -445,7 +445,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-22 01:47:15 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-relink.html b/git-relink.html index 7d14928..930936e 100644 --- a/git-relink.html +++ b/git-relink.html 
@@ -364,7 +364,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:53 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-remote-helpers.html b/git-remote-helpers.html index 89db9ec..4555a27 100644 --- a/git-remote-helpers.html +++ b/git-remote-helpers.html 
@@ -639,7 +639,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-19 06:46:05 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-remote.html b/git-remote.html index b74dc4c..7da9bd0 100644 --- a/git-remote.html +++ b/git-remote.html 
@@ -550,7 +550,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:53 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-repack.html b/git-repack.html index feb4380..abece2c 100644 --- a/git-repack.html +++ b/git-repack.html 
@@ -498,7 +498,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:54 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-replace.html b/git-replace.html index 2b08003..ec6c2d6 100644 --- a/git-replace.html +++ b/git-replace.html 
@@ -419,7 +419,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:54 UTC  +Last updated 2010-04-24 02:56:05 UTC   </div>   </div>   </body>  
diff --git a/git-repo-config.html b/git-repo-config.html index 5fb1de3..84de0f7 100644 --- a/git-repo-config.html +++ b/git-repo-config.html 
@@ -329,7 +329,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:54 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-request-pull.html b/git-request-pull.html index b44cd5c..148dd7f 100644 --- a/git-request-pull.html +++ b/git-request-pull.html 
@@ -370,7 +370,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:54 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-rerere.html b/git-rerere.html index 61d5e93..1a745bc 100644 --- a/git-rerere.html +++ b/git-rerere.html 
@@ -528,7 +528,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:54 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-reset.html b/git-reset.html index d4cd21c..19b0383 100644 --- a/git-reset.html +++ b/git-reset.html 
@@ -890,7 +890,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-20 20:59:13 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-rev-list.html b/git-rev-list.html index b88a25b..98b372f 100644 --- a/git-rev-list.html +++ b/git-rev-list.html 
@@ -1781,7 +1781,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:24 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-rev-parse.html b/git-rev-parse.html index ad9bab6..92b4392 100644 --- a/git-rev-parse.html +++ b/git-rev-parse.html 
@@ -1069,7 +1069,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-07 22:24:59 UTC  +Last updated 2010-04-24 02:56:07 UTC   </div>   </div>   </body>  
diff --git a/git-revert.html b/git-revert.html index ab83db3..5b871ed 100644 --- a/git-revert.html +++ b/git-revert.html 
@@ -439,7 +439,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:55 UTC  +Last updated 2010-04-24 02:56:06 UTC   </div>   </div>   </body>  
diff --git a/git-rm.html b/git-rm.html index 8ea1724..f2e3fb2 100644 --- a/git-rm.html +++ b/git-rm.html 
@@ -526,7 +526,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:55 UTC  +Last updated 2010-04-24 02:56:07 UTC   </div>   </div>   </body>  
diff --git a/git-send-email.html b/git-send-email.html index 57686e7..45f95f9 100644 --- a/git-send-email.html +++ b/git-send-email.html 
@@ -823,7 +823,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:56 UTC  +Last updated 2010-04-24 02:56:07 UTC   </div>   </div>   </body>  
diff --git a/git-send-pack.html b/git-send-pack.html index 4c2fb34..c8d64d8 100644 --- a/git-send-pack.html +++ b/git-send-pack.html 
@@ -501,7 +501,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:47 UTC  +Last updated 2010-04-24 02:56:07 UTC   </div>   </div>   </body>  
diff --git a/git-sh-setup.html b/git-sh-setup.html index 28768f8..d7d3ca4 100644 --- a/git-sh-setup.html +++ b/git-sh-setup.html 
@@ -431,7 +431,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:57 UTC  +Last updated 2010-04-24 02:56:09 UTC   </div>   </div>   </body>  
diff --git a/git-shell.html b/git-shell.html index 6a60cb8..44f2fb7 100644 --- a/git-shell.html +++ b/git-shell.html 
@@ -347,7 +347,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:56 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-shortlog.html b/git-shortlog.html index 336d906..5b4d512 100644 --- a/git-shortlog.html +++ b/git-shortlog.html 
@@ -483,7 +483,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:56 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-show-branch.html b/git-show-branch.html index 4580dc3..1b59d31 100644 --- a/git-show-branch.html +++ b/git-show-branch.html 
@@ -612,7 +612,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-03 05:12:42 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-show-index.html b/git-show-index.html index 649d9b6..a7cc4cc 100644 --- a/git-show-index.html +++ b/git-show-index.html 
@@ -344,7 +344,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:57 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-show-ref.html b/git-show-ref.html index fdac367..7666fd8 100644 --- a/git-show-ref.html +++ b/git-show-ref.html 
@@ -521,7 +521,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-01 04:49:02 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-show.html b/git-show.html index 7798012..44fe1ae 100644 --- a/git-show.html +++ b/git-show.html 
@@ -974,7 +974,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:25 UTC  +Last updated 2010-04-24 02:56:08 UTC   </div>   </div>   </body>  
diff --git a/git-stage.html b/git-stage.html index d3a9be3..833657e 100644 --- a/git-stage.html +++ b/git-stage.html 
@@ -330,7 +330,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:57 UTC  +Last updated 2010-04-24 02:56:09 UTC   </div>   </div>   </body>  
diff --git a/git-stash.html b/git-stash.html index 52f7864..b2bb485 100644 --- a/git-stash.html +++ b/git-stash.html 
@@ -615,7 +615,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-19 09:57:47 UTC  +Last updated 2010-04-24 02:56:09 UTC   </div>   </div>   </body>  
diff --git a/git-status.html b/git-status.html index e59f02f..e7231c0 100644 --- a/git-status.html +++ b/git-status.html 
@@ -417,12 +417,56 @@  </div></div>   <div class="para"><p>where <tt>PATH1</tt> is the path in the <tt>HEAD</tt>, and <tt> -&gt; PATH2</tt> part is   shown only when <tt>PATH1</tt> corresponds to a different path in the  -index/worktree (i.e. renamed).</p></div>  -<div class="para"><p>For unmerged entries, <tt>X</tt> shows the status of stage #2 (i.e. ours) and <tt>Y</tt>  -shows the status of stage #3 (i.e. theirs).</p></div>  -<div class="para"><p>For entries that do not have conflicts, <tt>X</tt> shows the status of the index,  -and <tt>Y</tt> shows the status of the work tree. For untracked paths, <tt>XY</tt> are  -<tt>??</tt>.</p></div>  +index/worktree (i.e. the file is renamed). The <em>XY</em> is a two-letter  +status code.</p></div>  +<div class="para"><p>The fields (including the <tt>-&gt;</tt>) are separated from each other by a  +single space. If a filename contains whitespace or other nonprintable  +characters, that field will be quoted in the manner of a C string  +literal: surrounded by ASCII double quote (34) characters, and with  +interior special characters backslash-escaped.</p></div>  +<div class="para"><p>For paths with merge conflicts, <tt>X</tt> and <em>Y</em> show the modification  +states of each side of the merge. For paths that do not have merge  +conflicts, <tt>X</tt> shows the status of the index, and <tt>Y</tt> shows the status  +of the work tree. For untracked paths, <tt>XY</tt> are <tt>??</tt>. Other status  +codes can be interpreted as follows:</p></div>  +<div class="ilist"><ul>  +<li>  +<p>  +<em> </em> = unmodified  +</p>  +</li>  +<li>  +<p>  +<em>M</em> = modified  +</p>  +</li>  +<li>  +<p>  +<em>A</em> = added  +</p>  +</li>  +<li>  +<p>  +<em>D</em> = deleted  +</p>  +</li>  +<li>  +<p>  +<em>R</em> = renamed  +</p>  +</li>  +<li>  +<p>  +<em>C</em> = copied  +</p>  +</li>  +<li>  +<p>  +<em>U</em> = updated but unmerged  +</p>  +</li>  +</ul></div>  +<div class="para"><p>Ignored files are not listed.</p></div>   <div class="literalblock">   <div class="content">   <pre><tt>X Y Meaning  @@ -430,7 +474,7 @@  [MD] not updated   M [ MD] updated in index   A [ MD] added to index  -D [ MD] deleted from index  +D [ M] deleted from index   R [ MD] renamed in index   C [ MD] copied in index   [MARC] index and work tree matches  @@ -448,6 +492,15 @@  ? ? untracked   -------------------------------------------------</tt></pre>   </div></div>  +<div class="para"><p>There is an alternate -z format recommended for machine parsing. In  +that format, the status field is the same, but some other things  +change. First, the <em>-&gt;</em> is omitted from rename entries and the field  +order is reversed (e.g <em>from -&gt; to</em> becomes <em>to from</em>). Second, a NUL  +(ASCII 0) follows each filename, replacing space as a field separator  +and the terminating newline (but a space still separates the status  +field from the first filename). Third, filenames containing special  +characters are not specially formatted; no quoting or  +backslash-escaping is performed.</p></div>   </div>   <h2 id="_configuration">CONFIGURATION</h2>   <div class="sectionbody">  @@ -481,7 +534,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:57 UTC  +Last updated 2010-04-24 02:56:09 UTC   </div>   </div>   </body>  
diff --git a/git-status.txt b/git-status.txt index 1cab91b..2d4bbfc 100644 --- a/git-status.txt +++ b/git-status.txt 
@@ -72,21 +72,37 @@    where `PATH1` is the path in the `HEAD`, and ` -> PATH2` part is  shown only when `PATH1` corresponds to a different path in the -index/worktree (i.e. renamed). +index/worktree (i.e. the file is renamed). The 'XY' is a two-letter +status code.   -For unmerged entries, `X` shows the status of stage #2 (i.e. ours) and `Y` -shows the status of stage #3 (i.e. theirs). +The fields (including the `->`) are separated from each other by a +single space. If a filename contains whitespace or other nonprintable +characters, that field will be quoted in the manner of a C string +literal: surrounded by ASCII double quote (34) characters, and with +interior special characters backslash-escaped.   -For entries that do not have conflicts, `X` shows the status of the index, -and `Y` shows the status of the work tree. For untracked paths, `XY` are -`??`. +For paths with merge conflicts, `X` and 'Y' show the modification +states of each side of the merge. For paths that do not have merge +conflicts, `X` shows the status of the index, and `Y` shows the status +of the work tree. For untracked paths, `XY` are `??`. Other status +codes can be interpreted as follows: + +* ' ' = unmodified +* 'M' = modified +* 'A' = added +* 'D' = deleted +* 'R' = renamed +* 'C' = copied +* 'U' = updated but unmerged + +Ignored files are not listed.    X Y Meaning  -------------------------------------------------  [MD] not updated  M [ MD] updated in index  A [ MD] added to index - D [ MD] deleted from index + D [ M] deleted from index  R [ MD] renamed in index  C [ MD] copied in index  [MARC] index and work tree matches @@ -104,6 +120,15 @@  ? ? untracked  -------------------------------------------------   +There is an alternate -z format recommended for machine parsing. In +that format, the status field is the same, but some other things +change. First, the '->' is omitted from rename entries and the field +order is reversed (e.g 'from -> to' becomes 'to from'). Second, a NUL +(ASCII 0) follows each filename, replacing space as a field separator +and the terminating newline (but a space still separates the status +field from the first filename). Third, filenames containing special +characters are not specially formatted; no quoting or +backslash-escaping is performed.    CONFIGURATION  ------------- 
diff --git a/git-stripspace.html b/git-stripspace.html index 5f74b0f..9385649 100644 --- a/git-stripspace.html +++ b/git-stripspace.html 
@@ -364,7 +364,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:58 UTC  +Last updated 2010-04-24 02:56:09 UTC   </div>   </div>   </body>  
diff --git a/git-submodule.html b/git-submodule.html index 4e208dc..0b0aca2 100644 --- a/git-submodule.html +++ b/git-submodule.html 
@@ -661,7 +661,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:58 UTC  +Last updated 2010-04-24 02:56:10 UTC   </div>   </div>   </body>  
diff --git a/git-svn.html b/git-svn.html index 9d1b9c3..72bde6d 100644 --- a/git-svn.html +++ b/git-svn.html 
@@ -1619,7 +1619,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:58 UTC  +Last updated 2010-04-24 02:56:10 UTC   </div>   </div>   </body>  
diff --git a/git-symbolic-ref.html b/git-symbolic-ref.html index fb5b118..0bba54f 100644 --- a/git-symbolic-ref.html +++ b/git-symbolic-ref.html 
@@ -387,7 +387,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:58 UTC  +Last updated 2010-04-24 02:56:10 UTC   </div>   </div>   </body>  
diff --git a/git-tag.html b/git-tag.html index 12a4afa..bfe4982 100644 --- a/git-tag.html +++ b/git-tag.html 
@@ -628,7 +628,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:58 UTC  +Last updated 2010-04-24 02:56:10 UTC   </div>   </div>   </body>  
diff --git a/git-tar-tree.html b/git-tar-tree.html index d3a6e11..c2a1832 100644 --- a/git-tar-tree.html +++ b/git-tar-tree.html 
@@ -447,7 +447,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:59 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-tools.html b/git-tools.html index 99d8649..bd3eb02 100644 --- a/git-tools.html +++ b/git-tools.html 
@@ -486,7 +486,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:05 UTC  +Last updated 2010-04-24 02:56:17 UTC   </div>   </div>   </body>  
diff --git a/git-unpack-file.html b/git-unpack-file.html index 6b13bf2..4055031 100644 --- a/git-unpack-file.html +++ b/git-unpack-file.html 
@@ -355,7 +355,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:59 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-unpack-objects.html b/git-unpack-objects.html index 6d4f275..c8933e7 100644 --- a/git-unpack-objects.html +++ b/git-unpack-objects.html 
@@ -389,7 +389,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:59 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-update-index.html b/git-update-index.html index d08d0f4..6d7f30f 100644 --- a/git-update-index.html +++ b/git-update-index.html 
@@ -839,7 +839,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:59 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-update-ref.html b/git-update-ref.html index 22b8283..e6afaeb 100644 --- a/git-update-ref.html +++ b/git-update-ref.html 
@@ -408,7 +408,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 00:59:59 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-update-server-info.html b/git-update-server-info.html index 5fd1e86..d02d9c7 100644 --- a/git-update-server-info.html +++ b/git-update-server-info.html 
@@ -378,7 +378,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-upload-archive.html b/git-upload-archive.html index 0e820d7..4c30000 100644 --- a/git-upload-archive.html +++ b/git-upload-archive.html 
@@ -357,7 +357,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:11 UTC   </div>   </div>   </body>  
diff --git a/git-upload-pack.html b/git-upload-pack.html index f491b1d..667d889 100644 --- a/git-upload-pack.html +++ b/git-upload-pack.html 
@@ -374,7 +374,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-var.html b/git-var.html index 1b56d72..2436231 100644 --- a/git-var.html +++ b/git-var.html 
@@ -444,7 +444,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-03 05:12:42 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-verify-pack.html b/git-verify-pack.html index fc2420e..a296ee5 100644 --- a/git-verify-pack.html +++ b/git-verify-pack.html 
@@ -401,7 +401,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-verify-tag.html b/git-verify-tag.html index 8370c7f..0be0685 100644 --- a/git-verify-tag.html +++ b/git-verify-tag.html 
@@ -353,7 +353,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-web--browse.html b/git-web--browse.html index 760fbd7..79a7a2e 100644 --- a/git-web--browse.html +++ b/git-web--browse.html 
@@ -481,7 +481,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:00 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-whatchanged.html b/git-whatchanged.html index 8b3f316..ccfa94c 100644 --- a/git-whatchanged.html +++ b/git-whatchanged.html 
@@ -913,7 +913,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:25 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git-write-tree.html b/git-write-tree.html index 4924f61..ecb3f4d 100644 --- a/git-write-tree.html +++ b/git-write-tree.html 
@@ -372,7 +372,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:01 UTC  +Last updated 2010-04-24 02:56:12 UTC   </div>   </div>   </body>  
diff --git a/git.html b/git.html index 311349f..409227b 100644 --- a/git.html +++ b/git.html 
@@ -2081,7 +2081,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-23 06:55:42 UTC  +Last updated 2010-04-24 02:56:23 UTC   </div>   </div>   </body>  
diff --git a/git.txt b/git.txt index 105b0b5..c4024d0 100644 --- a/git.txt +++ b/git.txt 
@@ -43,6 +43,11 @@  branch of the `git.git` repository.  Documentation for older releases are available here:   +* link:v1.7.1/git.html[documentation for release 1.7.1] + +* release notes for + link:RelNotes-1.7.1.txt[1.7.1]. +  * link:v1.7.0.6/git.html[documentation for release 1.7.0.6]    * release notes for 
diff --git a/gitattributes.html b/gitattributes.html index 8e74e33..17ceee6 100644 --- a/gitattributes.html +++ b/gitattributes.html 
@@ -1057,7 +1057,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-24 01:12:36 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gitcli.html b/gitcli.html index ac1f393..562d046 100644 --- a/gitcli.html +++ b/gitcli.html 
@@ -514,7 +514,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:02 UTC  +Last updated 2010-04-24 02:56:14 UTC   </div>   </div>   </body>  
diff --git a/gitcore-tutorial.html b/gitcore-tutorial.html index 89249c0..9176a2c 100644 --- a/gitcore-tutorial.html +++ b/gitcore-tutorial.html 
@@ -2047,7 +2047,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:03 UTC  +Last updated 2010-04-24 02:56:15 UTC   </div>   </div>   </body>  
diff --git a/gitcvs-migration.html b/gitcvs-migration.html index 46088eb..b60ea5d 100644 --- a/gitcvs-migration.html +++ b/gitcvs-migration.html 
@@ -494,7 +494,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:03 UTC  +Last updated 2010-04-24 02:56:15 UTC   </div>   </div>   </body>  
diff --git a/gitdiffcore.html b/gitdiffcore.html index 0d54095..3e6f155 100644 --- a/gitdiffcore.html +++ b/gitdiffcore.html 
@@ -602,7 +602,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-22 01:47:16 UTC  +Last updated 2010-04-24 02:56:16 UTC   </div>   </div>   </body>  
diff --git a/gitglossary.html b/gitglossary.html index 82d4703..bc39c38 100644 --- a/gitglossary.html +++ b/gitglossary.html 
@@ -1166,7 +1166,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:04 UTC  +Last updated 2010-04-24 02:56:15 UTC   </div>   </div>   </body>  
diff --git a/githooks.html b/githooks.html index 44f7668..2d8fd10 100644 --- a/githooks.html +++ b/githooks.html 
@@ -602,7 +602,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-25 00:38:25 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gitignore.html b/gitignore.html index 92f3e73..7e5ba9a 100644 --- a/gitignore.html +++ b/gitignore.html 
@@ -486,7 +486,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:01 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gitk.html b/gitk.html index 408c3df..7a822bf 100644 --- a/gitk.html +++ b/gitk.html 
@@ -514,7 +514,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:01 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gitmodules.html b/gitmodules.html index db1a5f0..c579c46 100644 --- a/gitmodules.html +++ b/gitmodules.html 
@@ -401,7 +401,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:01 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gitrepository-layout.html b/gitrepository-layout.html index 404bd4c..8df42d0 100644 --- a/gitrepository-layout.html +++ b/gitrepository-layout.html 
@@ -661,7 +661,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:02 UTC  +Last updated 2010-04-24 02:56:13 UTC   </div>   </div>   </body>  
diff --git a/gittutorial-2.html b/gittutorial-2.html index da0c767..3e87ba4 100644 --- a/gittutorial-2.html +++ b/gittutorial-2.html 
@@ -724,7 +724,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:03 UTC  +Last updated 2010-04-24 02:56:14 UTC   </div>   </div>   </body>  
diff --git a/gittutorial.html b/gittutorial.html index baa66f3..35e02ce 100644 --- a/gittutorial.html +++ b/gittutorial.html 
@@ -916,7 +916,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:02 UTC  +Last updated 2010-04-24 02:56:14 UTC   </div>   </div>   </body>  
diff --git a/gitworkflows.html b/gitworkflows.html index a7410d3..219bce9 100644 --- a/gitworkflows.html +++ b/gitworkflows.html 
@@ -766,7 +766,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:05 UTC  +Last updated 2010-04-24 02:56:16 UTC   </div>   </div>   </body>  
diff --git a/howto-index.html b/howto-index.html index cf7651e..116130b 100644 --- a/howto-index.html +++ b/howto-index.html 
@@ -417,7 +417,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-04 19:11:47 UTC  +Last updated 2010-04-24 02:56:23 UTC   </div>   </div>   </body>  
diff --git a/howto/revert-branch-rebase.html b/howto/revert-branch-rebase.html index a9b5f93..2a8970f 100644 --- a/howto/revert-branch-rebase.html +++ b/howto/revert-branch-rebase.html 
@@ -482,7 +482,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:06 UTC  +Last updated 2010-04-24 02:56:17 UTC   </div>   </div>   </body>  
diff --git a/howto/using-merge-subtree.html b/howto/using-merge-subtree.html index 9099bf4..768145b 100644 --- a/howto/using-merge-subtree.html +++ b/howto/using-merge-subtree.html 
@@ -413,7 +413,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:06 UTC  +Last updated 2010-04-24 02:56:17 UTC   </div>   </div>   </body>  
diff --git a/technical/api-allocation-growing.html b/technical/api-allocation-growing.html index e4a4902..809ad71 100644 --- a/technical/api-allocation-growing.html +++ b/technical/api-allocation-growing.html 
@@ -354,7 +354,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:07 UTC  +Last updated 2010-04-24 02:56:18 UTC   </div>   </div>   </body>  
diff --git a/technical/api-builtin.html b/technical/api-builtin.html index 13bb33a..cb181a0 100644 --- a/technical/api-builtin.html +++ b/technical/api-builtin.html 
@@ -413,7 +413,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:07 UTC  +Last updated 2010-04-24 02:56:18 UTC   </div>   </div>   </body>  
diff --git a/technical/api-decorate.html b/technical/api-decorate.html index 26d33dc..b1e106b 100644 --- a/technical/api-decorate.html +++ b/technical/api-decorate.html 
@@ -317,7 +317,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:07 UTC  +Last updated 2010-04-24 02:56:18 UTC   </div>   </div>   </body>  
diff --git a/technical/api-diff.html b/technical/api-diff.html index 63fec3a..3d2a54b 100644 --- a/technical/api-diff.html +++ b/technical/api-diff.html 
@@ -630,7 +630,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:07 UTC  +Last updated 2010-04-24 02:56:19 UTC   </div>   </div>   </body>  
diff --git a/technical/api-directory-listing.html b/technical/api-directory-listing.html index d16b8dd..733cd17 100644 --- a/technical/api-directory-listing.html +++ b/technical/api-directory-listing.html 
@@ -443,7 +443,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:08 UTC  +Last updated 2010-04-24 02:56:19 UTC   </div>   </div>   </body>  
diff --git a/technical/api-gitattributes.html b/technical/api-gitattributes.html index c8f6663..c503bb4 100644 --- a/technical/api-gitattributes.html +++ b/technical/api-gitattributes.html 
@@ -465,7 +465,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:08 UTC  +Last updated 2010-04-24 02:56:19 UTC   </div>   </div>   </body>  
diff --git a/technical/api-grep.html b/technical/api-grep.html index b9af6b8..b8b9e49 100644 --- a/technical/api-grep.html +++ b/technical/api-grep.html 
@@ -324,7 +324,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:08 UTC  +Last updated 2010-04-24 02:56:20 UTC   </div>   </div>   </body>  
diff --git a/technical/api-hash.html b/technical/api-hash.html index 80588d7..8eead24 100644 --- a/technical/api-hash.html +++ b/technical/api-hash.html 
@@ -396,7 +396,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:08 UTC  +Last updated 2010-04-24 02:56:20 UTC   </div>   </div>   </body>  
diff --git a/technical/api-history-graph.html b/technical/api-history-graph.html index 2736936..934c9b7 100644 --- a/technical/api-history-graph.html +++ b/technical/api-history-graph.html 
@@ -541,7 +541,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:09 UTC  +Last updated 2010-04-24 02:56:20 UTC   </div>   </div>   </body>  
diff --git a/technical/api-in-core-index.html b/technical/api-in-core-index.html index 18176c4..6e9c933 100644 --- a/technical/api-in-core-index.html +++ b/technical/api-in-core-index.html 
@@ -385,7 +385,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:09 UTC  +Last updated 2010-04-24 02:56:20 UTC   </div>   </div>   </body>  
diff --git a/technical/api-index.html b/technical/api-index.html index 518ddf3..e7fbdb2 100644 --- a/technical/api-index.html +++ b/technical/api-index.html 
@@ -430,7 +430,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:13 UTC  +Last updated 2010-04-24 02:56:24 UTC   </div>   </div>   </body>  
diff --git a/technical/api-lockfile.html b/technical/api-lockfile.html index 2f4722f..2feba35 100644 --- a/technical/api-lockfile.html +++ b/technical/api-lockfile.html 
@@ -409,7 +409,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:09 UTC  +Last updated 2010-04-24 02:56:21 UTC   </div>   </div>   </body>  
diff --git a/technical/api-object-access.html b/technical/api-object-access.html index 811833f..9e20b62 100644 --- a/technical/api-object-access.html +++ b/technical/api-object-access.html 
@@ -359,7 +359,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:10 UTC  +Last updated 2010-04-24 02:56:21 UTC   </div>   </div>   </body>  
diff --git a/technical/api-parse-options.html b/technical/api-parse-options.html index 342e109..48a1848 100644 --- a/technical/api-parse-options.html +++ b/technical/api-parse-options.html 
@@ -762,7 +762,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-03-03 05:12:43 UTC  +Last updated 2010-04-24 02:56:21 UTC   </div>   </div>   </body>  
diff --git a/technical/api-quote.html b/technical/api-quote.html index 7124968..d8b315b 100644 --- a/technical/api-quote.html +++ b/technical/api-quote.html 
@@ -334,7 +334,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:10 UTC  +Last updated 2010-04-24 02:56:21 UTC   </div>   </div>   </body>  
diff --git a/technical/api-remote.html b/technical/api-remote.html index fb5bc05..d7ea115 100644 --- a/technical/api-remote.html +++ b/technical/api-remote.html 
@@ -492,7 +492,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:10 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-revision-walking.html b/technical/api-revision-walking.html index 54d9efc..c9e1f3a 100644 --- a/technical/api-revision-walking.html +++ b/technical/api-revision-walking.html 
@@ -413,7 +413,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:10 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-run-command.html b/technical/api-run-command.html index a3421bc..957c2b1 100644 --- a/technical/api-run-command.html +++ b/technical/api-run-command.html 
@@ -719,7 +719,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-22 00:13:13 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-setup.html b/technical/api-setup.html index cf25be5..a32f79e 100644 --- a/technical/api-setup.html +++ b/technical/api-setup.html 
@@ -349,7 +349,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:11 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html index ed26d28..168ffb0 100644 --- a/technical/api-strbuf.html +++ b/technical/api-strbuf.html 
@@ -770,7 +770,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:11 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-string-list.html b/technical/api-string-list.html index 11500e8..9450b29 100644 --- a/technical/api-string-list.html +++ b/technical/api-string-list.html 
@@ -542,7 +542,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-04-07 04:35:52 UTC  +Last updated 2010-04-24 02:56:22 UTC   </div>   </div>   </body>  
diff --git a/technical/api-tree-walking.html b/technical/api-tree-walking.html index 67dcfcf..52d9425 100644 --- a/technical/api-tree-walking.html +++ b/technical/api-tree-walking.html 
@@ -571,7 +571,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:11 UTC  +Last updated 2010-04-24 02:56:23 UTC   </div>   </div>   </body>  
diff --git a/technical/api-xdiff-interface.html b/technical/api-xdiff-interface.html index a3b6a75..ca15487 100644 --- a/technical/api-xdiff-interface.html +++ b/technical/api-xdiff-interface.html 
@@ -318,7 +318,7 @@  </div>   <div id="footer">   <div id="footer-text">  -Last updated 2010-02-13 01:00:11 UTC  +Last updated 2010-04-24 02:56:23 UTC   </div>   </div>   </body>  
diff --git a/user-manual.html b/user-manual.html index 3401af0..a80c31a 100644 --- a/user-manual.html +++ b/user-manual.html 
@@ -1,4 +1,4 @@ -<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User's Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id332960"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id332970">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -&gt; index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -&gt; object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -&gt; index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -&gt; working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" title="Preface"><div class="titlepage"><div><div><h2 class="title"><a name="id332970"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX +<html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"><title>Git User's Manual (for version 1.5.3 or newer)</title><link rel="stylesheet" href="docbook-xsl.css" type="text/css"><meta name="generator" content="DocBook XSL Stylesheets V1.75.2"></head><body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"><div lang="en" class="book" title="Git User's Manual (for version 1.5.3 or newer)"><div class="titlepage"><div><div><h1 class="title"><a name="id551959"></a>Git User's Manual (for version 1.5.3 or newer)</h1></div></div><hr></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="preface"><a href="#id551969">Preface</a></span></dt><dt><span class="chapter"><a href="#repositories-and-branches">1. Repositories and Branches</a></span></dt><dd><dl><dt><span class="section"><a href="#how-to-get-a-git-repository">How to get a git repository</a></span></dt><dt><span class="section"><a href="#how-to-check-out">How to check out a different version of a project</a></span></dt><dt><span class="section"><a href="#understanding-commits">Understanding History: Commits</a></span></dt><dd><dl><dt><span class="section"><a href="#understanding-reachability">Understanding history: commits, parents, and reachability</a></span></dt><dt><span class="section"><a href="#history-diagrams">Understanding history: History diagrams</a></span></dt><dt><span class="section"><a href="#what-is-a-branch">Understanding history: What is a branch?</a></span></dt></dl></dd><dt><span class="section"><a href="#manipulating-branches">Manipulating branches</a></span></dt><dt><span class="section"><a href="#detached-head">Examining an old version without creating a new branch</a></span></dt><dt><span class="section"><a href="#examining-remote-branches">Examining branches from a remote repository</a></span></dt><dt><span class="section"><a href="#how-git-stores-references">Naming branches, tags, and other references</a></span></dt><dt><span class="section"><a href="#Updating-a-repository-With-git-fetch">Updating a repository with git fetch</a></span></dt><dt><span class="section"><a href="#fetching-branches">Fetching branches from other repositories</a></span></dt></dl></dd><dt><span class="chapter"><a href="#exploring-git-history">2. Exploring git history</a></span></dt><dd><dl><dt><span class="section"><a href="#using-bisect">How to use bisect to find a regression</a></span></dt><dt><span class="section"><a href="#naming-commits">Naming commits</a></span></dt><dt><span class="section"><a href="#creating-tags">Creating tags</a></span></dt><dt><span class="section"><a href="#browsing-revisions">Browsing revisions</a></span></dt><dt><span class="section"><a href="#generating-diffs">Generating diffs</a></span></dt><dt><span class="section"><a href="#viewing-old-file-versions">Viewing old file versions</a></span></dt><dt><span class="section"><a href="#history-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#counting-commits-on-a-branch">Counting the number of commits on a branch</a></span></dt><dt><span class="section"><a href="#checking-for-equal-branches">Check whether two branches point at the same history</a></span></dt><dt><span class="section"><a href="#finding-tagged-descendants">Find first tagged version including a given fix</a></span></dt><dt><span class="section"><a href="#showing-commits-unique-to-a-branch">Showing commits unique to a given branch</a></span></dt><dt><span class="section"><a href="#making-a-release">Creating a changelog and tarball for a software release</a></span></dt><dt><span class="section"><a href="#Finding-comments-With-given-Content">Finding commits referencing a file with given content</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#Developing-With-git">3. Developing with git</a></span></dt><dd><dl><dt><span class="section"><a href="#telling-git-your-name">Telling git your name</a></span></dt><dt><span class="section"><a href="#creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#how-to-make-a-commit">How to make a commit</a></span></dt><dt><span class="section"><a href="#creating-good-commit-messages">Creating good commit messages</a></span></dt><dt><span class="section"><a href="#ignoring-files">Ignoring files</a></span></dt><dt><span class="section"><a href="#how-to-merge">How to merge</a></span></dt><dt><span class="section"><a href="#resolving-a-merge">Resolving a merge</a></span></dt><dd><dl><dt><span class="section"><a href="#conflict-resolution">Getting conflict-resolution help during a merge</a></span></dt></dl></dd><dt><span class="section"><a href="#undoing-a-merge">Undoing a merge</a></span></dt><dt><span class="section"><a href="#fast-forwards">Fast-forward merges</a></span></dt><dt><span class="section"><a href="#fixing-mistakes">Fixing mistakes</a></span></dt><dd><dl><dt><span class="section"><a href="#reverting-a-commit">Fixing a mistake with a new commit</a></span></dt><dt><span class="section"><a href="#fixing-a-mistake-by-rewriting-history">Fixing a mistake by rewriting history</a></span></dt><dt><span class="section"><a href="#checkout-of-path">Checking out an old version of a file</a></span></dt><dt><span class="section"><a href="#interrupted-work">Temporarily setting aside work in progress</a></span></dt></dl></dd><dt><span class="section"><a href="#ensuring-good-performance">Ensuring good performance</a></span></dt><dt><span class="section"><a href="#ensuring-reliability">Ensuring reliability</a></span></dt><dd><dl><dt><span class="section"><a href="#checking-for-corruption">Checking the repository for corruption</a></span></dt><dt><span class="section"><a href="#recovering-lost-changes">Recovering lost changes</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#sharing-development">4. Sharing development with others</a></span></dt><dd><dl><dt><span class="section"><a href="#getting-updates-With-git-pull">Getting updates with git pull</a></span></dt><dt><span class="section"><a href="#submitting-patches">Submitting patches to a project</a></span></dt><dt><span class="section"><a href="#importing-patches">Importing patches to a project</a></span></dt><dt><span class="section"><a href="#public-repositories">Public git repositories</a></span></dt><dd><dl><dt><span class="section"><a href="#setting-up-a-public-repository">Setting up a public repository</a></span></dt><dt><span class="section"><a href="#exporting-via-git">Exporting a git repository via the git protocol</a></span></dt><dt><span class="section"><a href="#exporting-via-http">Exporting a git repository via http</a></span></dt><dt><span class="section"><a href="#pushing-changes-to-a-public-repository">Pushing changes to a public repository</a></span></dt><dt><span class="section"><a href="#forcing-push">What to do when a push fails</a></span></dt><dt><span class="section"><a href="#setting-up-a-shared-repository">Setting up a shared repository</a></span></dt><dt><span class="section"><a href="#setting-up-gitweb">Allowing web browsing of a repository</a></span></dt></dl></dd><dt><span class="section"><a href="#sharing-development-examples">Examples</a></span></dt><dd><dl><dt><span class="section"><a href="#maintaining-topic-branches">Maintaining topic branches for a Linux subsystem maintainer</a></span></dt></dl></dd></dl></dd><dt><span class="chapter"><a href="#cleaning-up-history">5. Rewriting history and maintaining patch series</a></span></dt><dd><dl><dt><span class="section"><a href="#patch-series">Creating the perfect patch series</a></span></dt><dt><span class="section"><a href="#using-git-rebase">Keeping a patch series up to date using git rebase</a></span></dt><dt><span class="section"><a href="#rewriting-one-commit">Rewriting a single commit</a></span></dt><dt><span class="section"><a href="#reordering-patch-series">Reordering or selecting from a patch series</a></span></dt><dt><span class="section"><a href="#patch-series-tools">Other tools</a></span></dt><dt><span class="section"><a href="#problems-With-rewriting-history">Problems with rewriting history</a></span></dt><dt><span class="section"><a href="#bisect-merges">Why bisecting merge commits can be harder than bisecting linear history</a></span></dt></dl></dd><dt><span class="chapter"><a href="#advanced-branch-management">6. Advanced branch management</a></span></dt><dd><dl><dt><span class="section"><a href="#fetching-individual-branches">Fetching individual branches</a></span></dt><dt><span class="section"><a href="#fetch-fast-forwards">git fetch and fast-forwards</a></span></dt><dt><span class="section"><a href="#forcing-fetch">Forcing git fetch to do non-fast-forward updates</a></span></dt><dt><span class="section"><a href="#remote-branch-configuration">Configuring remote branches</a></span></dt></dl></dd><dt><span class="chapter"><a href="#git-concepts">7. Git concepts</a></span></dt><dd><dl><dt><span class="section"><a href="#the-object-database">The Object Database</a></span></dt><dd><dl><dt><span class="section"><a href="#commit-object">Commit Object</a></span></dt><dt><span class="section"><a href="#tree-object">Tree Object</a></span></dt><dt><span class="section"><a href="#blob-object">Blob Object</a></span></dt><dt><span class="section"><a href="#trust">Trust</a></span></dt><dt><span class="section"><a href="#tag-object">Tag Object</a></span></dt><dt><span class="section"><a href="#pack-files">How git stores objects efficiently: pack files</a></span></dt><dt><span class="section"><a href="#dangling-objects">Dangling objects</a></span></dt><dt><span class="section"><a href="#recovering-from-repository-corruption">Recovering from repository corruption</a></span></dt></dl></dd><dt><span class="section"><a href="#the-index">The index</a></span></dt></dl></dd><dt><span class="chapter"><a href="#submodules">8. Submodules</a></span></dt><dd><dl><dt><span class="section"><a href="#_pitfalls_with_submodules">Pitfalls with submodules</a></span></dt></dl></dd><dt><span class="chapter"><a href="#low-level-operations">9. Low-level git operations</a></span></dt><dd><dl><dt><span class="section"><a href="#object-manipulation">Object access and manipulation</a></span></dt><dt><span class="section"><a href="#the-workflow">The Workflow</a></span></dt><dd><dl><dt><span class="section"><a href="#working-directory-to-index">working directory -&gt; index</a></span></dt><dt><span class="section"><a href="#index-to-object-database">index -&gt; object database</a></span></dt><dt><span class="section"><a href="#object-database-to-index">object database -&gt; index</a></span></dt><dt><span class="section"><a href="#index-to-working-directory">index -&gt; working directory</a></span></dt><dt><span class="section"><a href="#tying-it-all-together">Tying it all together</a></span></dt></dl></dd><dt><span class="section"><a href="#examining-the-data">Examining the data</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees">Merging multiple trees</a></span></dt><dt><span class="section"><a href="#merging-multiple-trees-2">Merging multiple trees, continued</a></span></dt></dl></dd><dt><span class="chapter"><a href="#hacking-git">10. Hacking git</a></span></dt><dd><dl><dt><span class="section"><a href="#object-details">Object storage format</a></span></dt><dt><span class="section"><a href="#birdview-on-the-source-code">A birds-eye view of Git's source code</a></span></dt></dl></dd><dt><span class="chapter"><a href="#glossary">11. Git Glossary</a></span></dt><dt><span class="appendix"><a href="#git-quick-start">A. Git Quick Reference</a></span></dt><dd><dl><dt><span class="section"><a href="#quick-creating-a-new-repository">Creating a new repository</a></span></dt><dt><span class="section"><a href="#managing-branches">Managing branches</a></span></dt><dt><span class="section"><a href="#exploring-history">Exploring history</a></span></dt><dt><span class="section"><a href="#making-changes">Making changes</a></span></dt><dt><span class="section"><a href="#merging">Merging</a></span></dt><dt><span class="section"><a href="#sharing-your-changes">Sharing your changes</a></span></dt><dt><span class="section"><a href="#repository-maintenance">Repository maintenance</a></span></dt></dl></dd><dt><span class="appendix"><a href="#todo">B. Notes and todo list for this manual</a></span></dt></dl></div><div class="preface" title="Preface"><div class="titlepage"><div><div><h2 class="title"><a name="id551969"></a>Preface</h2></div></div></div><p>Git is a fast distributed revision control system.</p><p>This manual is designed to be readable by someone with basic UNIX  command-line skills, but no previous knowledge of git.</p><p><a class="xref" href="#repositories-and-branches" title="Chapter 1. Repositories and Branches">Chapter 1, <i>Repositories and Branches</i></a> and <a class="xref" href="#exploring-git-history" title="Chapter 2. Exploring git history">Chapter 2, <i>Exploring git history</i></a> explain how  to fetch and study a project using git—read these chapters to learn how  to build and test a particular version of a software project, search for